From 90dfca290c412b8e6c63170ec278f9d59a78f577 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 9 Mar 2020 08:22:55 -0700
Subject: [PATCH] gdk: Drop surface-type

We have interfaces for surface subtypes now.
---
 gdk/gdksurface.c        | 34 ----------------------------------
 gdk/gdksurface.h        | 17 -----------------
 gdk/gdksurfaceprivate.h |  9 +++++++--
 3 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index b2276bedd6..746a1f493b 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -81,7 +81,6 @@ enum {
 
 enum {
   PROP_0,
-  PROP_SURFACE_TYPE,
   PROP_CURSOR,
   PROP_DISPLAY,
   PROP_FRAME_CLOCK,
@@ -381,8 +380,6 @@ gdk_surface_init (GdkSurface *surface)
 {
   /* 0-initialization is good for all other fields. */
 
-  surface->surface_type = GDK_SURFACE_TOPLEVEL;
-
   surface->state = GDK_SURFACE_STATE_WITHDRAWN;
   surface->fullscreen_mode = GDK_FULLSCREEN_ON_CURRENT_MONITOR;
   surface->width = 1;
@@ -447,13 +444,6 @@ gdk_surface_class_init (GdkSurfaceClass *klass)
                             FALSE,
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  properties[PROP_SURFACE_TYPE] =
-      g_param_spec_enum ("surface-type",
-                          P_("Surface type"),
-                          P_("Surface type"),
-                          GDK_TYPE_SURFACE_TYPE, GDK_SURFACE_TOPLEVEL,
-                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 
   /**
@@ -619,10 +609,6 @@ gdk_surface_set_property (GObject      *object,
       gdk_surface_set_frame_clock (surface, GDK_FRAME_CLOCK (g_value_get_object (value)));
       break;
 
-    case PROP_SURFACE_TYPE:
-      surface->surface_type = g_value_get_enum (value);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -657,10 +643,6 @@ gdk_surface_get_property (GObject    *object,
       g_value_set_boolean (value, GDK_SURFACE_IS_MAPPED (surface));
       break;
 
-    case PROP_SURFACE_TYPE:
-      g_value_set_enum (value, surface->surface_type);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -891,22 +873,6 @@ gdk_surface_get_widget (GdkSurface *surface)
   return surface->widget;
 }
 
-/**
- * gdk_surface_get_surface_type:
- * @surface: a #GdkSurface
- *
- * Gets the type of the surface. See #GdkSurfaceType.
- *
- * Returns: type of surface
- **/
-GdkSurfaceType
-gdk_surface_get_surface_type (GdkSurface *surface)
-{
-  g_return_val_if_fail (GDK_IS_SURFACE (surface), (GdkSurfaceType) -1);
-
-  return GDK_SURFACE_TYPE (surface);
-}
-
 /**
  * gdk_surface_get_display:
  * @surface: a #GdkSurface
diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index 2b48e2a42d..7a43059c78 100644
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -38,21 +38,6 @@
 
 G_BEGIN_DECLS
 
-/**
- * GdkSurfaceType:
- * @GDK_SURFACE_TOPLEVEL: toplevel window (used to implement #GtkWindow)
- * @GDK_SURFACE_TEMP: override redirect temporary surface (used to implement #GtkMenu)
- * @GDK_SURFACE_POPUP: popup window with semantics like xdg-popover
- *
- * Describes the kind of surface.
- */
-typedef enum
-{
-  GDK_SURFACE_TOPLEVEL,
-  GDK_SURFACE_TEMP,
-  GDK_SURFACE_POPUP
-} GdkSurfaceType;
-
 /* Size restriction enumeration.
  */
 /**
@@ -346,8 +331,6 @@ GdkSurface *   gdk_surface_new_popup            (GdkSurface    *parent,
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_destroy               (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
-GdkSurfaceType gdk_surface_get_surface_type     (GdkSurface     *surface);
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_is_destroyed          (GdkSurface     *surface);
 
 GDK_AVAILABLE_IN_ALL
diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index 583a9bd12c..e0cd1d9e13 100644
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -26,6 +26,13 @@
 
 G_BEGIN_DECLS
 
+typedef enum
+{
+  GDK_SURFACE_TOPLEVEL,
+  GDK_SURFACE_TEMP,
+  GDK_SURFACE_POPUP
+} GdkSurfaceType;
+
 struct _GdkSurface
 {
   GObject parent_instance;
@@ -41,8 +48,6 @@ struct _GdkSurface
   gint x;
   gint y;
 
-  GdkSurfaceType surface_type;
-
   guint8 resize_count;
 
   GdkGLContext *gl_paint_context;
-- 
2.30.2